Expand support for EVP_PKEY_HMAC #1933
Open
+261
−117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
justsmth
force-pushed
the
ruby-hmac-integ
branch
from
0a7bbfc
to
7bb440d
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1933 +/- ##
=======================================
Coverage 78.67% 78.68%
=======================================
Files 585 585
Lines 100849 100915 +66
Branches 14299 14312 +13
=======================================
+ Hits 79347 79403 +56
- Misses 20868 20875 +7
- Partials 634 637 +3 ☔ View full report in Codecov by Sentry. |
justsmth
force-pushed
the
ruby-hmac-integ
branch
3 times, most recently
from
a1b36dd
to
c8d764b
Compare
justsmth
changed the title
justsmth
force-pushed
the
ruby-hmac-integ
branch
from
c8d764b
to
9f6315e
Compare
WillChilds-Klein
approved these changes
Oct 24, 2024
| HMAC_KEY *hmac = NULL; | ||
| HMAC_PKEY_CTX *hctx = ctx->data; | ||
| if(hctx == NULL) { | ||
| OPENSSL_PUT_ERROR(EVP, EVP_R_INVALID_PARAMETERS); |
There was a problem hiding this comment.
Nit: EVP_R_INVALID_PARAMETERS is more applicable to invalid ASN.1 inputs, EVP_R_OPERATON_NOT_INITIALIZED might be a bit better.
Suggested change
| OPENSSL_PUT_ERROR(EVP, EVP_R_INVALID_PARAMETERS); | |
| OPENSSL_PUT_ERROR(EVP, EVP_R_OPERATON_NOT_INITIALIZED); |
| @@ -81,6 +81,10 @@ static int hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src) { | |||
| sctx = src->data; | |||
| dctx = dst->data; | |||
| dctx->md = sctx->md; | |||
| if(sctx->ktmp.key != NULL && !HMAC_KEY_copy(&sctx->ktmp, &dctx->ktmp)) { | |||
There was a problem hiding this comment.
Do we need to guard sctx->ktmp before accessing the internals?
Suggested change
| if(sctx->ktmp.key != NULL && !HMAC_KEY_copy(&sctx->ktmp, &dctx->ktmp)) { | |
| if(sctx->ktmp != NULL && sctx->ktmp.key != NULL && !HMAC_KEY_copy(&sctx->ktmp, &dctx->ktmp)) { |
| static const char *hmac_hexkey = "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"; | ||
|
|
||
| TEST_F(EvpPkeyCtxCtrlStrTest, HMACKey) { | ||
| // Test Cases from RFC 5869. |
There was a problem hiding this comment.
RFC 5869 seems to be referring to HKDF?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issues:
Addresses CryptoAlg-2695
Description of changes:
EVP_PKEY_HMACEVP_PKEY_CTX_ctrl_str.EVP_PKEY_CTRL_SET_MAC_KEYoperation w/EVP_PKEY_CTX_ctrlTesting:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.